bitkeeper revision 1.1159.258.70 (4244a079wh98lZeg0t3eZdAEyBTNPQ)

Tools makefile cleanup and fix for parallel build.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/Makefile b/tools/Makefile
index c582a014d00a545df223bad653145f31c1f10c4c..0308c7512f3fdd86de9c375ab584a91ada881119 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,32 +1,34 @@
+XEN_ROOT = ../
+include $(XEN_ROOT)/tools/Rules.mk
 
-all:   
-       $(MAKE) -C check
-       $(MAKE) -C libxutil
-       $(MAKE) -C libxc
-       $(MAKE) -C misc
-       $(MAKE) -C examples
-       $(MAKE) -C xentrace
-       $(MAKE) -C python
-       $(MAKE) -C xfrd
+SUBDIRS :=
+SUBDIRS += libxutil
+SUBDIRS += libxc
+SUBDIRS += misc
+SUBDIRS += examples
+SUBDIRS += xentrace
+SUBDIRS += python
+SUBDIRS += xfrd
 
-install: 
-       $(MAKE) -C check
-       $(MAKE) -C libxutil install
-       $(MAKE) -C libxc install
-       $(MAKE) -C misc install
-       $(MAKE) -C examples install
-       $(MAKE) -C xentrace install
-       $(MAKE) -C python install
-       $(MAKE) -C xfrd install
-       $(MAKE) -C sv install
+.PHONY: all install clean check check_clean
+
+all: check
+       @set -e; for subdir in $(SUBDIRS); do \
+               $(MAKE) -C $$subdir $@; \
+       done
 
-clean build:
-       $(MAKE) -C check $@
-       $(MAKE) -C libxutil $@
-       $(MAKE) -C libxc $@
-       $(MAKE) -C misc $@
-       $(MAKE) -C examples $@
-       $(MAKE) -C xentrace $@
-       $(MAKE) -C python $@
-       $(MAKE) -C xfrd $@
+install: check
+       @set -e; for subdir in $(SUBDIRS); do \
+               $(MAKE) -C $$subdir $@; \
+       done
+
+clean: check_clean
+       @set -e; for subdir in $(SUBDIRS); do \
+               $(MAKE) -C $$subdir $@; \
+       done
+
+check:
+       $(MAKE) -C check
 
+check_clean:
+       $(MAKE) -C check clean